projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7a2d3e 14c8f6a)
bitkeeper revision 1.1236.1.125 (4242ef8aRFQzhOTTcIl53kSEbAetfg)
authorxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Thu, 24 Mar 2005 16:49:14 +0000 (16:49 +0000)
committerxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Thu, 24 Mar 2005 16:49:14 +0000 (16:49 +0000)
Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
BitKeeper/etc/logging_ok patch | diff1 | diff2 | blob | history
xen/drivers/char/console.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc BitKeeper/etc/logging_ok
Simple merge
diff --cc xen/drivers/char/console.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.